Fixes the critical warnings from bug #317999, thus fixing the bug

2005-11-28  Federico Mena Quintero  <federico@ximian.com>

	Fixes the critical warnings from bug #317999, thus fixing the bug
	completely:

	* gtk/gtkfilechooserdefault.c
	(gtk_file_chooser_default_get_paths): In SELECT_FOLDER mode,
	use _gtk_file_chooser_get_current_folder_path() instead of fetching the
	impl->current_folder directly.  The latter may be null if we are
	in RELOAD_NONE state.

diff --git a/ChangeLog b/ChangeLog
index 876bb3f96511093612afc2ff965f600ffc4e08e4..f25ba7e561322f45ac965f1624ddef7ae5922bae 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2005-11-28  Federico Mena Quintero  <federico@ximian.com>
+
+       Fixes the critical warnings from bug #317999, thus fixing the bug
+       completely:
+
+       * gtk/gtkfilechooserdefault.c
+       (gtk_file_chooser_default_get_paths): In SELECT_FOLDER mode,
+       use _gtk_file_chooser_get_current_folder_path() instead of fetching the
+       impl->current_folder directly.  The latter may be null if we are
+       in RELOAD_NONE state.
+
 2005-11-28  Federico Mena Quintero  <federico@ximian.com>
 
        Fix bug #321560, based on a patch by Bogdan Nicula (bogdanni@hotmail.com):

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 876bb3f96511093612afc2ff965f600ffc4e08e4..f25ba7e561322f45ac965f1624ddef7ae5922bae 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,14 @@
+2005-11-28  Federico Mena Quintero  <federico@ximian.com>
+
+       Fixes the critical warnings from bug #317999, thus fixing the bug
+       completely:
+
+       * gtk/gtkfilechooserdefault.c
+       (gtk_file_chooser_default_get_paths): In SELECT_FOLDER mode,
+       use _gtk_file_chooser_get_current_folder_path() instead of fetching the
+       impl->current_folder directly.  The latter may be null if we are
+       in RELOAD_NONE state.
+
 2005-11-28  Federico Mena Quintero  <federico@ximian.com>
 
        Fix bug #321560, based on a patch by Bogdan Nicula (bogdanni@hotmail.com):

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index ebf4ddc0cd4ebfa6543be35e163eba9a25b49a24..00a78a9706cb7c170de288ba3aa71ea49ffbb6c4 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -5701,7 +5701,7 @@ gtk_file_chooser_default_get_paths (GtkFileChooser *chooser)
   if (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER &&
       info.result == NULL)
     {
-      info.result = g_slist_prepend (info.result, gtk_file_path_copy (impl->current_folder));
+      info.result = g_slist_prepend (info.result, _gtk_file_chooser_get_current_folder_path (chooser));
     }
 
   return g_slist_reverse (info.result);